Applied patch from Deji Akingunola <dakingun@gmail.com> to make babl

correctly pick up the path to the extensions on 64bit systems. Fixes
bug #510038
* babl/Makefile.am: added -DLIBDIR
* babl/babl-extension.c: use libdir and not PREFIX "/lib" when
defining the default BABL_PATH.

svn path=/trunk/; revision=274

diff --git a/ChangeLog b/ChangeLog
index 9731e30c413b6bd7aaacc27f7304071c910caadd..0591e282d8e8e6ea368b1240d957963e0f17cfa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-17  Øyvind Kolås  <pippin@gimp.org>
+
+       Applied patch from Deji Akingunola <dakingun@gmail.com> to make babl
+       correctly pick up the path to the extensions on 64bit systems. Fixes
+       bug #510038
+
+       * babl/Makefile.am: added -DLIBDIR
+       * babl/babl-extension.c: use libdir and not PREFIX "/lib" when
+       defining the default BABL_PATH.
+
 2008-01-10  Sven Neumann  <sven@gimp.org>
 
        * extensions/gimp-8bit.c: added extension to speed up code paths

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 7fb676cd84a64a0ff7b198ca1937f512fd6543b7..24c3048075e08c612764e9694ae5e66b471c9b96 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -45,7 +45,7 @@ library_include_HEADERS =             \
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
 
-AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\"
+AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\"
 
 lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la
 libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources)

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 5f47b5e836362a745a573d1b93760da3295ceffd..47da01cf996abd16ec097a309b9b0c88dd82dca1 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#define BABL_PATH              PREFIX "/lib/" BABL_LIBRARY
+#define BABL_PATH              LIBDIR "/" BABL_LIBRARY
 
 #define BABL_INIT_HOOK         init_hook ();
 #define BABL_DESTROY_HOOK      destroy_hook ();